Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

apple-sdk_15: 15.0 -> 15.2; darwin.*: source release updates #381343

Merged
merged 14 commits into from
Feb 13, 2025

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Feb 12, 2025

Thankfully it is possible to save pages to the Wayback Machine again, and it works fine to archive the SDKs, so we shouldn’t run into any more bitrotting mishaps like #359460.

A few non‐trivial commits here that could use review; see the commit messages for details.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin {apple-sdk_{11,12,13,14,15},darwin.{AvailabilityVersions,ICU,PowerManagement,copyfile,developer_cmds,diskdev_cmds,libffi,libiconv,libpcap,network_cmds,system_cmds,top}}
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Apple like to remove old minor releases of the SDK when bumping to a
new one. Our current 15.0 SDK is already gone. Since these are all
the last minor version of their major version, they’re probably
not at risk of imminent deletion, but given their general practices
it makes sense to guard against, especially as we can’t be sure
ahead of time what the last minor version will be.
It seems like `unifdefall(1)` was omitted from this package previously;
I’m not sure why.
This was unhappy about missing BPF `struct` stuff. I’m not sure why
the private header thing was like that previously but it builds fine
like this.
Apple removed the `spray.x` source and replaced it with vendored
`rpcgen(1)` output for some reason. Not sure it’s worth trying to
undo that.
@emilazy emilazy added 6.topic: darwin Running or building packages on Darwin backport staging-24.11 Backport PR automatically labels Feb 12, 2025
@emilazy emilazy requested a review from a team February 12, 2025 03:30
@nix-owners nix-owners bot requested review from toonn and reckenrode February 12, 2025 03:33
@K900 K900 merged commit 496b396 into NixOS:staging Feb 13, 2025
25 checks passed
@emilazy emilazy deleted the push-uktkpllkuylr branch February 13, 2025 18:16
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Feb 13, 2025

Backport failed for staging-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin staging-24.11
git worktree add -d .worktree/backport-381343-to-staging-24.11 origin/staging-24.11
cd .worktree/backport-381343-to-staging-24.11
git switch --create backport-381343-to-staging-24.11
git cherry-pick -x 8f6d2b14efe41b6bbed6be180d4487ace1c84bb5 e8ad14c5a2c745eadfa5add729d11846ec96f3a3 d5a73874afb7378343d7d1bf82af542d826518c2 072f8e0c4d366343ae3baf7eba9bedd2b90b2731 bea823e65c4b98254963933b51115a0035e94385 c7377d3a15c000f81e96ba9d109ebbe5077e922a 51e7288bd3ac6c1969e4c6760f89ed9ffdb12c8c 5e0bf4044651ac8d3ebf663667651e4a761a7ada f51133dded7ff55a3bf30dabe63531ae8f37d10d 1db08b9f1e751417352baf3a559d039aca7298cd dab00cce78f9f4d5a8d5b497b301d5169f455a72 b9dd1e6d908ec4b2882e06430201ae78aa7ac159 100b5483295cf093358186b43080c4b0dc380591 a736ddeaec75f4a3f26d4d7b79bdb64f878d4074

@emilazy
Copy link
Member Author

emilazy commented Feb 15, 2025

Backport is #381933.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants